Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Dec 2011 04:24:34 +0000 (20:24 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Dec 2011 04:24:34 +0000 (20:24 -0800)
commit1cd6fcb42fc65be6a3776e90a1e3bd66558c9a46
treec5ccd843e4d2ad36da17e7ac30c9389217f15060
parent5baeca6743585c5f776d0168d2902a0b8cddb376
parent9d18e74a34594789bc8d53126b85a6e74f7ad723
Merge from trunk.